fix(assets-generation): Do not fail in case some App_Resources are missing #3557
+59
−4
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ssing In case you delete `App_Resources/iOS` directory, the `getAssetsStructure` method fails as it tries to read `Content.json` files from the deleted directory. Instead of failing, just return empty arrays for the images. This is already working this way for Android. Add test for the case
rosen-vladimirov
changed the title
Fatme
reviewed
May 2, 2018
| @@ -125,7 +125,7 @@ export class ProjectDataService implements IProjectDataService { | |||
|
|
|||
| private async getIOSAssetSubGroup(dirPath: string): Promise<IAssetSubGroup> { | |||
| const pathToContentJson = path.join(dirPath, AssetConstants.iOSResourcesFileName); | |||
| const content = <IAssetSubGroup>this.$fs.readJson(pathToContentJson); | |||
| const content = this.$fs.exists(pathToContentJson) && <IAssetSubGroup>this.$fs.readJson(pathToContentJson) || { images: [] }; | |||
There was a problem hiding this comment.
What will happen in case when pathToContentJson exists but the file is not a valid json? I'm expecting to throw an error in this case.
There was a problem hiding this comment.
Yeah, I prefer to throw the error in this case as it is not expected to have a non-json file here.
| const fs = testInjector.resolve<IFileSystem>("fs"); | ||
| fs.readJson = (filePath: string): any => { | ||
| if (basename(filePath) === AssetConstants.imageDefinitionsFileName) { | ||
| return { android: {}, ios: {} }; |
There was a problem hiding this comment.
In case when imageDefinitionsFileName file does not exist, an error will be thrown. I'm wondering if we should check this case.
There was a problem hiding this comment.
The file is part of CLI resources, so in case it does not exist, something terrible happened 😸
Fatme
approved these changes
May 2, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In case you delete
App_Resources/iOSdirectory, thegetAssetsStructuremethod fails as it tries to readContent.jsonfiles from the deleted directory. Instead of failing, just return empty arrays for the images. This is already working this way for Android.Add test for the case
PR Checklist
What is the current behavior?
Trying to generate/get assets structure fails when App_Resources/iOS is deleted
What is the new behavior?
The generation of assets will work for Android in this case.
Fixes ProgressNS/sidekick-feedback#168 .